Merge branch 'tqm5200_default_env' of /home/tur/git/u-boot
authorWolfgang Denk <[email protected]>
Wed, 10 Oct 2007 14:23:23 +0000 (16:23 +0200)
committerWolfgang Denk <[email protected]>
Wed, 10 Oct 2007 14:23:23 +0000 (16:23 +0200)

Trivial merge